email config fixes and missing translations

jamesperet vor 9 Jahren
Ursprung
Commit
1c53d06751
4 geänderte Dateien mit 10 neuen Zeilen und 10 gelöschten Zeilen
  1. 1 1
      app/views/devise/registrations/edit.html.erb
  2. 2 2
      config/environments/production.rb
  3. 2 0
      config/locales/en.yml
  4. 5 7
      readme.md

+ 1 - 1
app/views/devise/registrations/edit.html.erb

@@ -46,7 +46,7 @@
46 46
 				  <div class="clearfix"></div>
47 47
 			  </div>
48 48
 			  <div class="form-actions" style="margin: 0px; margin-top: 15px;">
49
-			    <%= f.submit  t 'registration.update' %>
49
+			    <%= f.submit  (t 'registration.update') %>
50 50
 			    <%= link_to (t 'nav.back'), :back, class: 'btn btn-link' %>
51 51
 			    <%= link_to ('<i class="fa fa-exclamation-triangle"></i> '+(t 'registration.cancel_account')).html_safe, registration_path(resource_name), data: { confirm: (t 'registration.cancel_confirmation') }, method: :delete, class: 'btn btn-danger pull-right' %>
52 52
 			  </div>

+ 2 - 2
config/environments/production.rb

@@ -80,7 +80,7 @@ RailsWebsiteTemplate::Application.configure do
80 80
   # Use default logging formatter so that PID and timestamp are not suppressed.
81 81
   config.log_formatter = ::Logger::Formatter.new
82 82
   
83
-  config.action_mailer.default_url_options = ENV["HEROKU_APP_URL"]
83
+  config.action_mailer.default_url_options = {:host => ENV["HEROKU_APP_URL"] }
84 84
   
85 85
   config.action_mailer.delivery_method = :smtp
86 86
   config.action_mailer.perform_deliveries = true
@@ -93,7 +93,7 @@ RailsWebsiteTemplate::Application.configure do
93 93
         :enable_starttls_auto => true, # detects and uses STARTTLS
94 94
         :user_name => ENV["MANDRILL_USERNAME"],
95 95
         :password  => ENV["MANDRILL_KEY"], # SMTP password is any valid API key
96
-        :authentication => 'login', # Mandrill supports 'plain' or 'login'
96
+        :authentication => 'plain', # Mandrill supports 'plain' or 'login'
97 97
         :domain => ENV["DOMAIN_NAME"] # your domain to identify your server when connecting
98 98
   }
99 99
   

+ 2 - 0
config/locales/en.yml

@@ -292,4 +292,6 @@ en:
292 292
     new_password: New Password
293 293
     confirm_your_new_password: Confirm New Password
294 294
     change_password: Save Password
295
+    cancel_account: Delete Account
296
+    cancel_confirmation: Are you sure you want to delete your account permenantly?
295 297
     edit_password: Edit password

+ 5 - 7
readme.md

@@ -26,13 +26,11 @@ A template for creating rails websites that includes the following:
26 26
 ## Heroku Deploy
27 27
 
28 28
 1. Create a new heroku app: ```heroku create new-app-name```
29
-2. Run ```rake assets:precompile```
30
-3. Run ```figaro heroku:set -e production``` to copy env variables from ```config/application.yml```  and set them in heroku
31
-4. Add the heroku postgre addon:  ```heroku addons:add heroku-postgresql``` to create and configure a *postgres* database in heroku server
32
-5. Commit changes: ```git commit -a -m "commit message"```
33
-6. Push to heroku:  ```git push heroku master``` to deploy the repo
34
-7. Migrate the database: ```heroku run rake db:migrate```
35
-8. Create the initial config and admin user: ```heroku run rake bootstrap:all```
29
+2. Run ```figaro heroku:set -e production``` to copy env variables from ```config/application.yml```  and set them in heroku
30
+3. Add the heroku postgre addon:  ```heroku addons:add heroku-postgresql``` to create and configure a *postgres* database in heroku server
31
+4. Push to heroku:  ```git push heroku master``` to deploy the repo
32
+5. Migrate the database: ```heroku run rake db:migrate```
33
+6. Create the initial config and admin user: ```heroku run rake bootstrap:all```
36 34
 
37 35
 ## Todo's
38 36